From 18bf06d3a46af7bfc02698f75562699dc7f8f0ec Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 5 Jul 2016 21:32:04 +0200
Subject: [PATCH] cargo package: overwrite existing tarballs

Previously, cargo package did not do anything if a tarball already
existed. This is wrong, because the source may have changed and cargo
does not do any dependency tracking for package tarballs yet, so it did
not notice this.

This commit changes cargo package to always overwrite existing tarballs,
which works fine until proper dependency tracking is implemented.

Fixes #2799
---
 src/cargo/ops/cargo_package.rs |  9 ++----
 tests/package.rs               | 59 ++++++++++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
index e00e0b4e4..461068fb4 100644
--- a/src/cargo/ops/cargo_package.rs
+++ b/src/cargo/ops/cargo_package.rs
@@ -52,12 +52,9 @@ pub fn package(ws: &Workspace,
 
     let filename = format!("{}-{}.crate", pkg.name(), pkg.version());
     let dir = config.target_dir(ws).join("package");
-    let mut dst = match dir.open_ro(&filename, config, "packaged crate") {
-        Ok(f) => return Ok(Some(f)),
-        Err(..) => {
-            let tmp = format!(".{}", filename);
-            try!(dir.open_rw(&tmp, config, "package scratch space"))
-        }
+    let mut dst = {
+        let tmp = format!(".{}", filename);
+        try!(dir.open_rw(&tmp, config, "package scratch space"))
     };
 
     // Package up and test a temporary tarball and only move it to the final
diff --git a/tests/package.rs b/tests/package.rs
index 03ccb8511..511344c23 100644
--- a/tests/package.rs
+++ b/tests/package.rs
@@ -3,15 +3,17 @@ extern crate flate2;
 extern crate git2;
 extern crate hamcrest;
 extern crate tar;
+extern crate cargo;
 
 use std::fs::File;
 use std::io::prelude::*;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
+use cargo::util::process;
 use cargotest::cargo_process;
-use cargotest::support::{project, execs, paths, git, path2url};
+use cargotest::support::{project, execs, paths, git, path2url, cargo_dir};
 use flate2::read::GzDecoder;
-use hamcrest::{assert_that, existing_file};
+use hamcrest::{assert_that, existing_file, contains};
 use tar::Archive;
 
 #[test]
@@ -406,3 +408,54 @@ Caused by:
   cannot package a filename with a special character `:`: src/:foo
 "));
 }
+
+#[test]
+fn repackage_on_source_change() {
+    let p = project("foo")
+        .file("Cargo.toml", r#"
+            [project]
+            name = "foo"
+            version = "0.0.1"
+            authors = []
+        "#)
+        .file("src/main.rs", r#"
+            fn main() { println!("hello"); }
+        "#);
+
+    assert_that(p.cargo_process("package"),
+                execs().with_status(0));
+
+    // Add another source file
+    let mut file = File::create(p.root().join("src").join("foo.rs")).unwrap_or_else(|e| {
+        panic!("could not create file {}: {}", p.root().join("src/foo.rs").display(), e)
+    });
+
+    file.write_all(r#"
+        fn main() { println!("foo"); }
+    "#.as_bytes()).unwrap();
+    std::mem::drop(file);
+
+    let mut pro = process(&cargo_dir().join("cargo"));
+    pro.arg("package").cwd(p.root());
+
+    // Check that cargo rebuilds the tarball
+    assert_that(pro, execs().with_status(0).with_stderr(&format!("\
+[WARNING] [..]
+[PACKAGING] foo v0.0.1 ({dir})
+[VERIFYING] foo v0.0.1 ({dir})
+[COMPILING] foo v0.0.1 ({dir}[..])
+",
+        dir = p.url())));
+
+    // Check that the tarball contains the added file
+    let f = File::open(&p.root().join("target/package/foo-0.0.1.crate")).unwrap();
+    let mut rdr = GzDecoder::new(f).unwrap();
+    let mut contents = Vec::new();
+    rdr.read_to_end(&mut contents).unwrap();
+    let mut ar = Archive::new(&contents[..]);
+    let entries = ar.entries().unwrap();
+    let entry_paths = entries.map(|entry| {
+        entry.unwrap().path().unwrap().into_owned()
+    }).collect::<Vec<PathBuf>>();
+    assert_that(&entry_paths, contains(vec![PathBuf::from("foo-0.0.1/src/foo.rs")]));
+}
-- 
2.30.2